Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 17 Nov 2005 11:59:58 +0000 (12:59 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 17 Nov 2005 11:59:58 +0000 (12:59 +0100)

Trivial merge